Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32

Conflicts:

	MAINTAINERS
	MAKEALL
	Makefile

diff --cc MAINTAINERS
index bcac300224b8b4a2aa8242b5c912517557635059,0ff2addaf8f3ab4531a1d303ecc039ca4daf8083..10a25e14a6d9e2c42fcc0679280d2adc9470db3c
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -62,7 -62,7 +62,7 @@@ Joe D'Abbraccio <[email protected]
  
        MPC837xERDB     MPC837x
  
--Kári Davíðsson <[email protected]>
++K�ri Dav��sson <[email protected]>
  
        FLAGADM         MPC823
  
@@@ -482,7 -482,7 +482,7 @@@ Peter Figuli <[email protected]
  
        wepep250        xscale
  
--Marius Gröger <[email protected]>
++Marius Gr�ger <[email protected]>
  
        impa7           ARM720T (EP7211)
        ep7312          ARM720T (EP7312)
@@@ -514,7 -514,7 +514,7 @@@ Prakash Kumar <[email protected]
  
        cerf250         xscale
  
--David Müller <[email protected]>
++David M�ller <[email protected]>
  
        smdk2410        ARM920T
        VCMA9           ARM920T
@@@ -570,7 -570,7 +570,7 @@@ Kyungmin Park <[email protected]
  
        apollon         ARM1136EJS
  
--Alex Züpke <[email protected]>
++Alex Z�pke <[email protected]>
  
        lart            SA1100
        dnp1110         SA1110
@@@ -598,7 -598,7 +598,7 @@@ Unknown / orphaned boards
  #     Board           CPU                                             #
  #########################################################################
  
--Daniel Engström <[email protected]>
++Daniel Engstr�m <[email protected]>
  
        sc520_cdp       x86
  
@@@ -709,11 -709,10 +709,15 @@@ Haavard Skinnemoen <[email protected]
        ATSTK1006       AT32AP7000
        ATNGW100        AT32AP7000
  
 +Alex Raimondi <[email protected]>
 +Julien May <[email protected]>
 +
 +      HAMMERHEAD              AT32AP7000
 +
+ Hans-Christian Egtvedt <[email protected]>
+ 
+       FAVR-32-EZKIT           AT32AP7000
+ 
  #########################################################################
  # SuperH Systems:                                                     #
  #                                                                     #

diff --cc MAKEALL
index d14cb79acfb76125188c41e12c606c49c6be4dba,76dd334db0de41c56058e91c086a21c3096e2c3f..d7196db7fc22193945a97a6d333dda8ea098d6f0
--- 1/MAKEALL
--- 2/MAKEALL
+++ b/MAKEALL
@@@ -714,7 -714,7 +714,8 @@@ LIST_avr32="               
        atstk1004       \
        atstk1006       \
        atngw100        \
+       favr-32-ezkit   \
 +      hammerhead      \
  "
  
  #########################################################################

diff --cc Makefile
index acc36f4ab6bb0c6ad66a8c53e344b6dbb5e2ef1d,ebbf2bce95da6f52f0cb65c749408558be64a2bf..51d49ed34c2d82f51b6d07c8188e59cb70f66837
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -2911,9 -2911,9 +2911,12 @@@ atstk1004_config       :       unconfi
  atstk1006_config      :       unconfig
        @$(MKCONFIG) $(@:_config=) avr32 at32ap atstk1000 atmel at32ap700x
  
+ favr-32-ezkit_config  :       unconfig
+       @$(MKCONFIG) $(@:_config=) avr32 at32ap favr-32-ezkit earthlcd at32ap700x
+ 
 +hammerhead_config     :       unconfig
 +      @$(MKCONFIG) $(@:_config=) avr32 at32ap hammerhead miromico at32ap700x
 +
  #========================================================================
  # SH3 (SuperH)
  #========================================================================